Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

*: check if GetStore returns nil (#4347) #4379

Merged
merged 4 commits into from
Nov 30, 2021
Merged

*: check if GetStore returns nil (#4347) #4379

merged 4 commits into from
Nov 30, 2021

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #4347

close #4344

Signed-off-by: disksing i@disksing.com

What problem does this PR solve?

If we use remove tombstone, GetStore may return nil. We should check it.

What is changed and how it works?

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release note

Fix panic issue after TiKV node scales in

@disksing @ti-chi-bot
This is an automated cherry-pick of tikv#4347
385a6ee 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Nov 24, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • nolouch
  • rleungx

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved labels Nov 24, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Nov 24, 2021
Merged
@ti-chi-bot ti-chi-bot added do-not-merge/invalid-commit-message type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.0 The PR belongs to release-5.0 cherry pick. labels Nov 24, 2021
@disksing
resolve conflicts
95d9e6a 
Signed-off-by: disksing <i@disksing.com>
@codecov
Copy link

codecov bot commented Nov 25, 2021 •
edited
Loading

Codecov Report

Merging #4379 (a982d15) into release-5.0 (a4a4c5a) will increase coverage by 0.01%.
The diff coverage is 33.33%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-5.0    #4379      +/-   ##
===============================================
+ Coverage        74.87%   74.88%   +0.01%     
===============================================
  Files              245      245              
  Lines            24336    24348      +12     
===============================================
+ Hits             18221    18233      +12     
+ Misses            4504     4501       -3     
- Partials          1611     1614       +3
Flag Coverage Δ
unittests 74.88% <33.33%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
server/schedule/region_scatterer.go 86.09% <0.00%> (-2.39%) ⬇️
server/schedule/checker/replica_strategy.go 88.37% <50.00%> (-4.13%) ⬇️
server/schedulers/shuffle_region.go 75.67% <50.00%> (-1.79%) ⬇️
server/statistics/store.go 90.67% <100.00%> (ø)
server/id/id.go 76.19% <0.00%> (-4.77%) ⬇️
server/election/leadership.go 85.88% <0.00%> (-1.18%) ⬇️
client/client.go 72.10% <0.00%> (-0.14%) ⬇️
server/server.go 72.43% <0.00%> (ø)
server/grpc_service.go 47.39% <0.00%> (+0.22%) ⬆️
client/base_client.go 82.98% <0.00%> (+0.51%) ⬆️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a4a4c5a...a982d15. Read the comment docs.

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 30, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 30, 2021
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 30, 2021
@ti-chi-bot
Copy link
Member Author

[FORMAT CHECKER NOTIFICATION]

Please provide the associated issue number in the commit messages, for example: close #12345, or ref #12345.

@nolouch
Copy link
Contributor

nolouch commented Nov 30, 2021

/merge

@ti-chi-bot
Copy link
Member Author

@nolouch: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: a982d15

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 30, 2021
@nolouch
Copy link
Contributor

nolouch commented Nov 30, 2021

/rebuild

@disksing disksing merged commit fcecc89 into tikv:release-5.0 Nov 30, 2021
@zhouqiang-cl zhouqiang-cl added this to the v5.0.6 milestone Dec 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rleungx rleungx rleungx approved these changes

@nolouch nolouch nolouch approved these changes

@disksing disksing Awaiting requested review from disksing

@HunDunDM HunDunDM Awaiting requested review from HunDunDM

Assignees

@disksing disksing

Labels
cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/invalid-commit-message release-note Denotes a PR that will be considered when it comes time to generate release notes. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. triage/accept type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.0 The PR belongs to release-5.0 cherry pick.
Projects
None yet
Milestone
v5.0.6
Development

Successfully merging this pull request may close these issues.
5 participants
@ti-chi-bot @nolouch @rleungx @disksing @zhouqiang-cl